archive/spotipy
1
0
Fork 0
mirror of https://github.com/c0de-archive/spotipy.git synced 2025-01-08 15:42:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix user having to login after first token refresh

Browse Source 
Fix issue where the get_cached_token method returns None instead of the
cached token object, meaning that users have to login again when the
initial token expires. The problem has two aspects:

- The first time the user calls get_cached_token after token
  expiration, the token is refreshed but the "new_token_info" object is
  not returned.

- The second time the user calls get_cached_token after token
  expiration, the scope check fails, because the refresh_access_token
  method didn't include the "scope" key when it cached the new
  token_info results.
This commit is contained in:
Matthew Duck 2014-08-04 15:42:15 +01:00
parent a6f096e3dc
commit 72d13dd0a7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spotipy/oauth2.py
View File

@ -39,7 +39,7 @@ class SpotifyOAuth(object):
return None return None
if self.is_token_expired(token_info): if self.is_token_expired(token_info):
new_token_info = self.refresh_access_token(token_info['refresh_token']) token_info = self.refresh_access_token(token_info['refresh_token'])
except IOError: except IOError:
pass pass
@ -91,8 +91,7 @@ class SpotifyOAuth(object):
if response.status_code is not 200: if response.status_code is not 200:
raise SpotifyOauthError(response.reason) raise SpotifyOauthError(response.reason)
token_info = response.json() token_info = response.json()
token_info['expires_at'] = int(time.time()) + token_info['expires_in'] token_info = self._add_custom_values_to_token_info(token_info)
token_info['scope'] = self.scope
self.save_token_info(token_info) self.save_token_info(token_info)
return token_info return token_info
@ -114,9 +113,18 @@ class SpotifyOAuth(object):
if response.status_code is not 200: if response.status_code is not 200:
raise SpotifyOauthError(response.reason) raise SpotifyOauthError(response.reason)
token_info = response.json() token_info = response.json()
token_info['expires_at'] = int(time.time()) + token_info['expires_in'] token_info = self._add_custom_values_to_token_info(token_info)
if not 'refresh_token' in token_info: if not 'refresh_token' in token_info:
token_info['refresh_token'] = refresh_token token_info['refresh_token'] = refresh_token
self.save_token_info(token_info) self.save_token_info(token_info)
return token_info return token_info
def _add_custom_values_to_token_info(self, token_info):
'''
Store some values that aren't directly provided by a Web API
response.
'''
token_info['expires_at'] = int(time.time()) + token_info['expires_in']
token_info['scope'] = self.scope
return token_info